Enable skipping plugins search at build time.

Forwarded: not-needed

This patch sets
QT_SKIP_AUTO_PLUGIN_INCLUSION and QT_SKIP_AUTO_QML_PLUGIN_INCLUSION to ON
by default, thus avoiding unnecesary build dependencies on plugins.

The variables can still be set to OFF by the user at build time, allowing
them to find the packages if necessary. But if you need so for a Debian
package please reach the Qt maintainers first. We want to know why you
need to do so. Thanks in advance!

Gbp-Pq: Name enable_skip_plugins.patch

diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in
index a6ca60bbd129a6c52582492ef67f41480b1500e3..e45e88dd87e5aea256af8da0b0515569b301f566 100644 (file)
--- a/cmake/QtPlugins.cmake.in
+++ b/cmake/QtPlugins.cmake.in
@@ -6,7 +6,7 @@ include_guard(DIRECTORY)
 
 # Distributions should probably change this default.
 if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
-    set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
+    set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON)
 endif()
 
 if(__qt_@QT_MODULE@_targets_file_included AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)

diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake
index 749e40e3f2ac61d3673d2e03e7d540e15edb2a18..912808814feec1f4939273ce50d4ea91fd9f69ed 100644 (file)
--- a/cmake/QtPublicPluginHelpers.cmake
+++ b/cmake/QtPublicPluginHelpers.cmake
@@ -607,7 +607,7 @@ macro(__qt_internal_include_qml_plugin_packages)
 
     # Distributions should probably change this default.
     if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
-        set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
+        set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION ON)
     endif()
 
     set(__qt_qml_plugins_config_file_list "")